Fixes #1
Merge pull request #2 from vwxyz/dev

Fixes #1