Cleaned code and more OOP
Merge branch 'master' of github.com:ediardo/YatMYM