Merge branch 'hotfix-0.1.1'
Merge branch 'develop'
Merge branch 'develop'
added extended implementation of rr