Merge pull request #229 from clocksmith/master