Modify stuff to make it work on Linux...
Merge pull request #180 from kalbermattenm/linux

Modify stuff to make it work on Linux...