Pull request for issue #39

Fixes #39. Generated by conveyor-workflow.