Everything is refactored :)
Merge pull request #5 from truepl/master

Everything is refactored :)