Fixes #133
Fixes #129