Fixed issues detected by scrutinizer-ci
Merge branch 'hotfix/0.1.3'