further changes
Merge branch 'ivan' into dev