bugfix : #ifdef in header
Merge remote-tracking branch 'github/master' into comp_test