Fixes #29
Merge pull request #31 from mlubin/master

Fixes #29