quickfix #2
Merge branch 'dovrsavam-tim'