mcrossley Merge pull request #141 from mcrossley/master