something minor
Merge pull request #3 from saulelis/step1

something minor
Merge pull request #4 from saulelis/step1

Step1 320 and 480 almost done, plus some code cleaning
_base cleanup
_base cleanup
_base cleanup
conflictz
Merge pull request #5 from saulelis/step2

_base cleanup
conflictz
Merge pull request #6 from saulelis/step2

conflictz