duffney Closes issue #8