Cleaned up items discovered by the code analysis tool
Merge branch 'master' of https://github.com/efieleke/CommandLib