Merge pull request #1 from PortaMx/master

Merged
Merge pull request #2 from PortaMx/development

Merge pull request #1 from PortaMx/master