New version

Bug fixes, capture from micro, javadoc