Fixed compilation errors on gcc
Merge pull request #211 from peastman/master

Fixed compilation errors on gcc