Resolves issue #3