A little documentation
Minor fix
Minor fix
Merge remote-tracking branch 'origin/master' into py3k