code was formatted and some of names changed
Merge pull request #12 from sabaka/master

Code changed