Clean code
Merge pull request #5 from hermesj/master

Clean code