Merge pull request #13 from vhordejcuk/master

javadoc, etc.
Cosmetics, etc.