Pull request for issue #181

Fixes #181. Generated by conveyor-workflow.