Merge pull request #9 from german92/develop

Develop