Merge pull request #1 from JAMEXHACK/master

Update
Merge pull request #2 from HackNet-Industries/master

Merge pull request #1 from JAMEXHACK/master