C99 version
Proper C99
Merge branch 'c99' into develop