Using Lombok to get rid of explicit getters and setters.
Merge remote-tracking branch 'origin/master'