bug fix (issue #6)
merging in so the commit message will reference the right issue