Resolves #173