Updating tags
Fixing markup
Merge branch 'master' into v20130613