Added HMP support
Fixed -C99 issue