Merge pull request #1 from staskobzar/master

sssss
Merge remote-tracking branch 'upstream/master'

* upstream/master:
git upstream