Add active class to lib
Update test for active state
Merge branch 'master' into gh-pages
U