Closes issue #1 6.2, 7.1