Merge pull request #43 from fgenolini/master

Refactoring