Merge pull request #8 from kordero/master

Code cleaning