Merge branch 'jc/c99'