Fixed isActive() to handle recursion better.
Merge branch 'release/1.0.4'