Fixing stuff
Updated with the changes to master branch.
Made some cleanup.
Merge pull request #5 from uportnykh/test_branch

Fixing stuff