Merge pull request #8 from tkrille/master

code cleanup
Merge pull request #9 from tkrille/master

ignoring wrong sonar violations