Pull request for issue #34

Fixes #34. Generated by conveyor-workflow.