Fixed linux compilation, by updating path and running dos2unix
Merged with current head