Merge pull request #1 from nothings/master

Update from original