resolved active class issues
Merge branch 'issue-84' into develop