Modified files for ha functionality
Merge pull request #142 from xeregin/master

Modified files for ha functionality