Two enhancements resulting in 2.1.0