Fixed compilation errors on OS X 10.9
Merge pull request #213 from peastman/master

Fixed compilation errors on OS X 10.9