Added i386 support