Merge pull request #2 from afavia/master

afavia changes