Resolves pull request #84