bugfix headers, dance around identity fotis@cern.ch

Only header changes here; sry for the noise; 
this change should be stable for another 5 years or such...
Clarification, for the record:

This is the only non-header change, in relation to Pull Requests #86 & #98.
There are more things that have been contrib'd in the past, however I won't dive into that now...