Merge pull request #1 from villvirt/master

Update from original