Added a few extra specs.
Data attributes are now parsed correctly
Merge branch 'develop'