refactoring to true OOP code
Merge pull request #1 from meshenka/master

refactoring to true OOP code