updated to use preprocessor macros for ease of testing
updated .gitignore and README