New
New
Porting to more recent gcc
Updated