Merge pull request #1 from conda/master

update new ones