Merge pull request #3 from Hawstein/dev

Dev
update
Merge branch 'master' of https://github.com/weiqiyiji/pai into dev