Merge pull request #1 from RootKiller/master

Update