Updated configure + Makefile