Merge pull request #2 from villvirt/master

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

Merge pull request #2 from villvirt/master