Updated to GNU coding