Fix warning on mismatching If/EndIf
Fix trailing tokens on #endif
Merge pull request #12 from krig/minor-linux-fixes

Minor linux fixes