Merge branch 'hotfix/psr2'
Coveralls in unittests
Merge branch 'hotfix/coveralls' into develop