Issue 91

Fixes #91