replaced spaces with dashes in html id
Merge remote-tracking branch 'origin/master'