Final commit
Merge pull request #5 from adrianitech/develop

Final commit