Merge pull request #1 from iwno/master

first
Merge pull request #9 from khazeeva/master

Merge pull request #1 from iwno/master