Dani sechel

Merge final version with master