Update 'done'
Refactor to add data-* attributes
Implement 'done'
Refactor HTML
Merge branch 'master' into gh-pages