fixed headers for ubuntu
fixed
Merge branch 'master' into ubuntu
fixes