Jonathan Carter Merge pull request #109 from mergwyn/master