--- a/JavaClassRegistry.st	Sun Aug 04 01:46:45 2013 +0100
+++ b/JavaClassRegistry.st	Mon Aug 05 10:45:36 2013 +0100
@@ -321,7 +321,7 @@
                             put: reloadedClass.
                         self registerClassInSmalltalk: reloadedClass notify: false.
                     ].
-                    Smalltalk changed: #classDefinition with: newClass.
+                    Smalltalk changed: #classDefinition with: reloadedClass.
                     ^self.             
                 ].
             ] ifFalse:[
@@ -342,7 +342,7 @@
 
     "Created: / 23-10-2011 / 11:53:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-11-2011 / 18:40:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 08-02-2013 / 00:54:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-08-2013 / 14:01:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 registerClassInSmalltalk: javaclass notify: doNotify
@@ -357,12 +357,14 @@
     nameComponents size > 1 ifTrue:[
         javaclass setCategory:((nameComponents asStringWith:$/ from:1 to:(nameComponents size - 1))
                             replaceAll:$/ with:$. ).
+    ] ifFalse:[
+        javaclass setCategory:#'(default)'
     ].
 
     nameComponents size > 1 ifTrue:[
         javaclass setPackage:((nameComponents copyButLast:1) asStringWith:$/) asSymbol
     ] ifFalse:[
-        javaclass setPackage:javaclass name asSymbol
+        javaclass setPackage:#'java/(default)'
     ].
 
     "/ break up the package and create nameSpaces
@@ -399,7 +401,7 @@
     ].
 
     "Created: / 04-04-2012 / 10:01:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (format): / 18-04-2013 / 22:51:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-08-2013 / 03:39:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 registerClasses: classes
@@ -408,6 +410,19 @@
     "Created: / 02-01-2013 / 17:01:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+registerClasses: classes andWait: doWait
+    "Register given set of classes and if
+     `doWait` is true, wait until all pending notifications
+     are delivered"
+
+    classes do:[:cls|self registerClass: cls].
+    doWait ifTrue:[
+        notifier waitUntilProcessed.
+    ]
+
+    "Created: / 04-08-2013 / 03:55:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 unregisterClass: oldClass
     | classes |