Fixed #18
Fixed CS
Added Makefile