Fixes compiler incompatibilities on 10.9
Merge pull request #3 from cspanring/master

Fixes compiler incompatibilities on 10.9