Merge pull request #230 from clocksmith/master