Merge pull request #22 from twiniars/master

current control activated
fix