Added c header
Merge branch 'master' into imag