Issue 91

Solves #91