Fix lombok still being used, close #3
Add lombok to fix errors thrown out during compile.
Merge remote-tracking branch 'origin/master'