major upgrade
latest fix
merger from droidedit