Merge pull request #8 from gepatino/develop

Merge develop
Merge branch 'master', remote-tracking branch 'origin' into develop