Resolved conflicts.
Merge branch 'master' of https://github.com/Hekta/commandhelper