use conditionals to support mac compilation target
Merge branch 'djz' into mac-djz