Fixes #121
Fixes #184