Merge pull request #42 from fgenolini/master

Sp
Refactoring