merge branch 'hotfix/v0.1.7'
merge branch 'release/v0.2.0'
rs now uses api v0.2.1
merge branch 'hotfix/v0.2.1' into develop