omg refactoring
Merge pull request #1 from dedalqq/master

omg refactoring