merge
Updated version
Renamed methods
Merge pull request #7 from vasichkin/meth_rename

Meth rename