Issue109

Fixes #109