Fix for mulitple underscore in the name
Merge branch 'release/1.1.0'
Merge tag '1.1.0' into develop

1.1.0