Fix compile errors on linux.
Merge pull request #108 from iven/master

Fix Linux Compiling - Part 2