Merge last changes from original repo

Keep up!