Added Makefile.
Cleaned up imports.
Merge pull request #1 from m1kc/master

Fixup