Resolves #174