Merge last changes from my fork