bug fix, v1.1 for production
resolve merge conflict
another commit of r2_index
added notes