Revert "Merge pull request #32 from drybjed/typofix"

This reverts commit b580e8f46664902a4cb19c099c11fc601055c07c, reversing
changes made to 38fdbf28c4a86138aeb06f708e87755c26e46a57.
Revert "Revert "Merge pull request #32 from drybjed/typofix""

This reverts commit 5eae386b3ab7716192c286dd02cb5ecb8d19b47d.
Merge pull request #36 from drybjed/revert-faulty-merge

Revert faulty merges