Updated with new fixes from GB, v2.0.2