Merge pull request #15 from tomboehmer/issue9