Ooloo

update version to snapshot and add some changes (quality code review with SonarQube)