Merge pull request #1 from hrydgard/master

Update from original