Merge pull request #1 from jinzhu/master

sync with master