Merge remote-tracking branch 'origin/master' into dev
merge from master
Merge pull request #34 from xiechao06/dev

merge