Patch from Johan Euphrosine <proppy@aminche.com>
Patch by Kevin Ko <kevin.s.ko@gmail.com>.
Patch from Alkis Evlogimenos <alkis@evlogimenos.com>.
