Reverting commited version of kinematic fitting code to original master as provided by Benedikt