fix config.h
clean up and fix merge
Merge pull request #12 from zx97/master

Clean up and fixes