Fixed compilation warnings on Linux
Merge pull request #33 from breese/next

Fixed compilation warnings on Linux
Merge remote-tracking branch 'upstream/next' into next