Fixed compile errors on Linux
Merge pull request #5 from ahockersten/ahockersten/compile_fixes_2

Fixed compile errors on Linux