Merge tag '2.1.0' into develop

2.1.0
Small improvments thanks to help from @zaufi