Issue/#415

Resolves #415