Some changes
Merge pull request #1206 from Mexahoid/patch-36

Some changes