changed to 32 bit only
Merge remote-tracking branch 'origin/master'