squash getters and setters with lombok
Merge remote-tracking branch 'origin/master'