#6

Closes issue #6