Resolves issue #22.