Pull request for issue #38

Fixes #38. Generated by conveyor-workflow.