Merge pull request #290 from chris5560/master