Improved code
Merge branch 'master' of https://github.com/gurgelrenan/another-test
divide code into classes