Optimization for the Makefile and Code
Add running examples.
removed merging conflicts