Merging last changes from elf's repo