Adding option for 32bit build
Merging master into development