Added option macros.
Fixed macros for release builds.