Merge pull request #21 from avkrotov/implemenets