Merge pull request #1 from yuhu-/master

get up-to-date