Updating parser to be more like the original paper
Adding Makefile