Merge pull request #38 from opennetworkinglab/HA-rebase

Ha rebase