Final version? Lol
Merge pull request #695 from Mexahoid/patch-21

Final version? Lol