Resolves #97