Merge pull request #8 from erickacevedor/master

Merge 5.2.1.1
Merge pull request #9 from erickacevedor/development

Merge pull request #9 from erickacevedor/master