Merge pull request #6 from SergeiYakimchik/master