Issue 272

Fixes #272.