Issue 112

Fixes #112