Pull request for issue #70

Fixes #70. Generated by conveyor-workflow.