Merging Renzoz Changes to the master branch

All credits due to renzoz, as i am a lazy fuck.