changed for declared election
Merge branch 'origin/master'