Scrutinizer fixes
Merge pull request #193 from karbowiak/master

Scrutinizer fixes