Update to 1.7
Merge pull request #1 from iFamasssxD/master

Update to 1.7