Fixing errors added during latest merge/pull
Merge pull request #168 from xenocrat/develop

Fixing errors added during latest merge/pull