Restored information for original authors for open-source codes
Resolve merge problems