added #defines, updated makefile
added debug in makefile
pulled in updates from an implementation
Merge pull request #3 from nuclearpidgeon/master

Merge back changes.