Merge pull request #13 from SergeiYakimchik/master

merge