Failover version: normal functionality

Fix bugs introduced over normal operation of controller
Merge pull request #93 from powerist/failover

Failover version: normal functionality