Mavericks Build Fixes
Merge pull request #43 from yamamushi/Yamamushi

Mavericks Build Fixes