Fixes #53
Fixes #29