Merge branch 'release/1.5.1' into develop
Added ctx manager
Update version
Merge branch 'release/1.6.0'