Preprocessor refactor to prevent conflicts
README update
Merge branch 'master' of github.com:Dekken/maiken