Issue 367

Resolves #367