Merge pull request #35 from guangyang/dev

merge from master to dev