Update dependencies
Merge remote-tracking branch 'upstream/master'
Fix for JavaDoc warnings
Merge pull request #47 from habuma/master

Fix JavaDoc warnings