Version finale
Merge pull request #12 from badboy0017/master

Version finale