Cleaning and simplification of code
Merge pull request #10 from devplanete/develop

Cleaning and simplification of code