Merge pull request #47 from habuma/master

Fix JavaDoc warnings