Resolves issue #7