(BUG) Resolved merge conflicts
Merge pull request #98 from Oleg24/angular/rebase

(BUG) Resolved merge conflicts