Code cleaning.
Merge pull request #6 from Luigi1992/develop

Code cleaning.