Cleaning Code
Merge pull request #1 from leico/master

Cleaning Code