Merge pull request #3 from aniacor/feature

Feature
Merge pull request #4 from aniacor/develop

Develop