Resolves issue #70