test
Merge pull request #1 from dasgrum/master

I shall appease you (since I'm about to rewrite the whole thing anyway)