Resolves #113