Merge pull request #83 from rampo/develop

2.1.0 in to master
Merge pull request #84 from rampo/develop

Develop
Merge pull request #85 from rampo/develop

Develop
Merge pull request #86 from rampo/develop

Code reordered
Spanish language correction

fix small errors in the Spanish language
Merge pull request #87 from jerson/patch-1

Spanish language correction
Merge pull request #88 from rampo/master

Spanish fixes to develop