Pull request for issue #64

Fixes #64. Generated by conveyor-workflow.