added more fixes for bug #2094
Merge branch 'gh-pages' of github.com:YotpoLtd/yotpo-ds into gh-pages