Merge pull request #1 from marijnh/master

Update from original