Merge pull request #21 from crackcomm/master

Fixes #20.