Merge branch 'release/ZjFiNj'
Merge tag '1.1.0' into develop

Added two new funcs