Merge pull request #394 from chris5560/master