Pull request for issue #55

Fixes #55. Generated by conveyor-workflow.