Bad preprocessor statements fixed
Merge branch 'master' of https://github.com/jpeg/Senior-Project