Removed Makefile. Closes #2
Merged ponty modifications