Updated installer and added Makefile
Fixed substitution bug in installer