Switched the ifdefs to address issue #39.
Merge pull request #43 from NHDaly/development

Switched the ifdefs to address issue #39.