solve /1 and /2 readid issues
Merge branch 'develop'