shyanfeng part merge with maintainer james
Merge pull request #6 from shyanfeng/master

shyanfeng part merge with maintainer james