Merge pull request #1 from discourse/master

updating