Merge pull request #1 from zanderso/master

Compile conditionally