Merge pull request #302 from chris5560/master