Merge pull request #29 from mirrorcoder/master

Command wrapper
[Fix] Some bugs