Merge pull request #400 from chris5560/master