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

Reverts villvirt/mahti#24