Merge pull request #2 from khaperets/dev

Dev