Resolves issue #138