Merge pull request #4 from Rainyan/rain01

Merge Rain01 to master
Fix unknown command in console
Merge pull request #5 from softashell/master

Fix unknown command in console
Fix merge conflict