Fixes #112
Merge pull request #113 from adobe-research/issue112

Fixes #112