Merge pull request #26 from Sriii/master

master to hasan
update
upd
...