Fixed a couple of mistakes
Merge pull request #13 from Egorand/master

Fixed a couple of mistakes and inconsistencies