Pull request for issue #196

Fixes #196. Generated by conveyor-workflow.