Fixed bug in client. Added Make rules