Issue/#223

Fixes #223