3rd commit
Merge pull request #5 from GuangyuGao/dev

3rd commit merged