Pull request for issue #29

Fixes #29. Generated by conveyor-workflow.