william-gr Merge pull request #21 from dmcgrandle/iss-20