updated Makefile and Namespace