Some imporovements
Merge branch 'vlada' into develop