Cleaned up command handling
Merge pull request #10 from ShadowDog007/master

Cleaned up command handling