Merge pull request #15 from jdurancomas/develop

Develop
Merge remote-tracking branch 'upstream/develop' into develop