Initial work
Initial work
Merge branch 'master' of http://github.com/shuaiwei/shell