Cleanup: Fix broken javadoc

Was stopping compilation
Merge pull request #64 from iZettle/fix-javadoc-compilation-errors

Cleanup: Fix broken javadoc