Refactor some code and change from Spanish to English.
Close #1
Merge branch 'bugfix-#1' into develop