Fixed javadoc on Java 8 and some small style fixes.
Merge pull request #5 from RX14/master

Fix javadoc on Java 8 and some small style fixes.