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