javadoc start
Merge pull request #135 from jateeter/master

javadoc start