Resolves #272