more optimal use of conditional compilation
Merge pull request #113 from liuch/master

more optimal use of conditional compilation