Merge pull request #134 from chris5560/master