Changed Makefile and added implicit/explicit template declaration