Fix Javadocs, minor code tweaks
Merge pull request #51 from smarthi/suneel

Fix Javadocs, minor code tweaks