Fixes #8

Please pull this in and bump the version. Thanks!