added support for html data-* properties
Merge branch 'master' into dante