some scrutinizer fixes
Merge pull request #11 from velikanov/master

some scrutinizer fixes