merged from saga c reference implementation august talk