Pull request for issue #13

Fixes #13. Generated by conveyor-workflow.