Fixed is active
Merge pull request #30 from isflorin/dev

Fixed is active