Testing, still
Merge pull request #2 from douggr/master

Fixes #1