Merge pull request #2 from rubenvb/master

fix compilation on Linux
MULTEM 17.12.2014
MULTEM 19.12.2014
some more compilation fixes