Merge pull request #1 from HackThis/master

Update