- Updated to be compiled with gcc-4.7