Pull request for issue #23

Fixes #23. Generated by conveyor-workflow.