Fixed compilation errors relating to issue 104
Merge pull request #115 from bluepeppers/master

Fixed compilation errors relating to fix for issue 104