removed extra divs and html tags
Merge branch 'master' into gh-pages

Merged in change from master