diff --git a/CHANGES.txt b/CHANGES.txt
index 2edff27..3ee178f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,13 @@
-Next Release
-  
+0.2
+
   - Added a new "disassemble" command to the monitor.  It can disassemble
-    any range of memory (e.g. "disassemble c000:c0010").  If labels have been
+    any range of memory ("disassemble c000:c010").  If labels have been
     defined, the disassembly will show them in the operands.
 
+  - Added a new "assemble" command to the monitor.  It can assemble a 
+    single instruction at an address ("assemble c000 jsr $ffd2").  
+    Labels in the operands are also supported ("assemble c000 jsr charout").
+
   - Moved the character I/O area from $E000 to $F000 for compatibility with
     the EhBASIC binary saved from Michal Kowalski's Windows-based simulator.  
     In a future version of Py65, the I/O area will be configurable.
diff --git a/TODO.txt b/TODO.txt
index bf19853..5dd2c15 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,3 +4,9 @@ Instructions needing unit tests:
   cpx
   cpy
   sbc
+
+Better error messages when assembling fails.
+
+Ability to assemble more than one instruction at a time.
+
+Windows support for non-blocking character input.
diff --git a/src/py65/version.txt b/src/py65/version.txt
index 49d5957..3b04cfb 100644
--- a/src/py65/version.txt
+++ b/src/py65/version.txt
@@ -1 +1 @@
-0.1
+0.2