Resolves issue #95