V2.2.1 rc

Includes @jeffxpx's contributions