Add some comments.
Add javadoc
Merge branch 'master' into dev