Merge pull request #1 from villvirt/master

Update from original
Merge pull request #9 from vvillee/master

Merge pull request #1 from villvirt/master