Added my previous patch from a couple of moinths ago.
Merge pull request #3 from tobier/master

Added my patch that wasn't added before: everything should build now on Linux.