Merge pull request #320 from chris5560/master