Pull request for issue #249

Fixes #249. Generated by conveyor-workflow.