Issue 123

Fixes #123