Small modification that enables compiling without std=c99
Merge branch 'dont_force_std_c99' into nicedevel