Merge pull request #308 from chris5560/master