Fixes #11
Merge pull request #16 from zachleat/master

Fixes #11