Pull request for issue #14

Fixes #14. Generated by conveyor-workflow.