GCC compile fixes
Merge pull request #14 from i30817/master

GCC compile fixes