Merge pull request #1 from mcedit/master

get latest