working
Merge pull request #2 from zalun/refactoring_to_classes

working