Fix Scrutinizer issues
Merge pull request #95 from humanmade/fix-scrutinizer-issues

Fix Scrutinizer issues