bug fix version 1.1 for production
resolve merging conflict with r2 index and master branch
edit index completed..