Added 32 bit support
Update indentation