Merge pull request #548 from chris5560/master