Pull request for issue #25

Fixes #25. Generated by conveyor-workflow.