Fixing #if
Merge pull request #32 from glennblock/dev

Fixing #if