Resolves issue #1