Merge pull request #297 from chris5560/master