Merge pull request #3 from fcanas/master

More refactoring