This resolves issue #1