Merge pull request #21 from twiniars/master

current mode
current control activated