Build Fixes
Merge pull request #96 from spolu/fixes_mac

Review: Build Fixes Mac