Resolves issue #359

See issue #359 for info.