Merge pull request #3 from WinterBall/master

upd