Fixes #132
Fixes #115