Issue/#270

Fixes #270