Merge pull request #1 from GeorgeBely/master

Catch changes
Some refactoring:)
Merge pull request #3 from Karloid/master

ololoPishPish