Merge pull request #1 from Trixarian/master

merge
Merge pull request #6 from mortaromarcello/master

Merge pull request #1 from Trixarian/master