Adds active check
Merge pull request #69 from isfit/activeCheck

Adds active check