vot ono 2
Merge branch 'bug' into develop