1.7.2 support! plus a few other things