Reset :span too
Merge branch 'dev'