Resolves issue #31.