Fixing linux build by removing win32-isms
Merge pull request #11 from jherico/master

Fixing linux build by removing win32-isms
Merge remote-tracking branch 'upstream/master'