Add i386 and armhf
Update makefile or whatever