Fixes #129
Fixes #131