Feature/fixes #94

Closed lcoram closed 7 years ago