Pull request for issue #11

Fixes #11. Generated by conveyor-workflow.