more fixes: trying to synchronize master with develop