Merge pull request #2 from mgubaidullin/renaming