Resolves #130