Pull request for issue #45

Fixes #45. Generated by conveyor-workflow.