Merge branch 'finish'
Merge branch 'master' into develop
Substitute span for label in examples
Merge pull request #6 from binaryphile/develop

Substitute span element for label in html examples