Merge pull request #2 from SergeiYakimchik/master