Merge pull request #5 from erickacevedor/development

Development Final 5.2.1.0
Merge pull request #6 from erickacevedor/master

Merge pull request #6 from erickacevedor/development