Changes to client/ added Makefile