Merge pull request #27 from Oblomov/master