Issue/#320

Fixes #320