Code cleanup
Correct onCommand returns
Merge conflict resolution
Merge pull request #1 from orthoplex64/master

Code cleanup