Merged in update_docs (pull request #83)
Update Changelog and bump version accordingly
Format code and fix up java doc
Update Changelog and bump version accordingly
Format code and fix up java doc