Merge pull request #7 from erickacevedor/development

Development
5.2.1.1
5.2.1.5
5.2.2
5.2.2.1
Merge pull request #8 from erickacevedor/master

Merge 5.2.1.1