Merge pull request #4 from javifond/development

Merge pull request #4 from javifond/development