Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com and modified by Dan.
Merge pull request #13 from dankempster/reworked-scrutinizr-patch-1

Scrutinizer Auto-Fixes