Fixed compilation errors on some platforms
Merge pull request #134 from peastman/master

Fixed compilation errors on some platforms