add
Merge branch 'master' of https://github.com/agrigoryan1/Electro
fix bugs