Merge pull request #83 from rnorris/patches