Fix issue #130 and JUnit/Javadoc improvements