Fixes #91
Fixes #88