Deleted extra code. Fix some defects.
Merge pull request #43 from danyaberezun/master

Убран лишний код.