merged #29
Bumped to 0.3.1