Resolves #137