porting latest version from master, upping version