Revert "Merge pull request #2 from villvirt/master"
Merge pull request #25 from villvirt/revert-24-master

Revert "Merge pull request #2 from villvirt/master"