Issue/#305

Fixes #305