Let me know what I'm doing right/wrong. :grin:
* Fixes #39