cleanup code
cont
Merge branch 'feature/cont' into develop
Merge branch 'release/v2.0'