Merge tag '0.2.10' into develop

0.2.10
Merge branch 'master' into develop
removed issues found by scrutinizer
Merge branch 'release/scrutinizer-refactors'