Added modifications for better FORTRAN 2003 support