fix 32-bit bug
Merge remote branch 'origin/master'