Cleaning code
Merge pull request #12 from walane/master

Cleaning code.