Pull request for issue #41

Fixes #41. Generated by conveyor-workflow.