Merge pull request #4 from dotted/master

Scary as fuck