Merge pull request #1 from JAMEXHACK/master

Update