Updated changes
Merge pull request #1260 from Unkn0wn0ne/patch-10

Updated changes