merged latest update from andrei