Merge pull request #11 from praccu/master

Updating
Errors removed.
Merge pull request #25 from kostya-viktorov/master

Errors removed