bug fix
Merge branch 'vladimir'