Cleaning up the code
Merge pull request #3 from camporez/master

Cleaning up the code from the last pull request