Merge pull request #1 from andersfurseth/master

Fixed compilation error.
Merge remote-tracking branch 'upstream/master'