Updated rmap and cquery for Github