linux compability
linux integration
Merge remote-tracking branch 'internetz/master'