Issue #24 - Removed old active class code.
Merge pull request #30 from alim/Issue_24

Issue #24 - Removed old active class code.
Merge pull request #34 from alim/development

Development - Merge latest development branch for Issue #24