upgrade to v2.4.1

A few fix and improving