Merge pull request #1 from scikit-learn/master

update