PR for #11

Fixes #11