Merge pull request #1 from zerithsmash/master

Update from original