changes and additions for 4.0.5
Merge pull request #326 from Mexahoid/patch-9

changes and additions for 4.0.5