Fixes dom
Fixes conflict
add doc ssw and fixed responce
Merge remote-tracking branch 'origin/master' into gh-pages