Pull request for issue #8

Fixes #8. Generated by conveyor-workflow.