Small fix and added javadoc template