Fixing scrutinizer reported issues
Update changelog
Merge pull request #13 from skymeyer/scrutinizer-fixes

Fixing scrutinizer reported issues