2.2.0 - small improvements