updates suggested by Junior Delaz
Merge pull request #392 from mewoch/jd

updates suggested by Junior Delaz