Resolves #356