Issue/#364

Resolves #364