Last merge

from Svetlin