Pull request for issue #187

Fixes #187. Generated by conveyor-workflow.