git merge fix
Merge branch 'master' of https://github.com/juliachvyrova/smartbullet
fix