Merge pull request #6 from seljucarlo/develop

merged
Merge pull request #7 from seljucarlo/master

Merge pull request #6 from seljucarlo/develop