Fixes #12
Merge pull request #14 from hacktavist/master

Fixes #12