Fixed #17
Merge pull request #26 from YetiForceCompany/HEAD

Fixed #17