Merge pull request #401 from chris5560/master