Update controllers
Merge pull request #7 from yanivgal123/updateControllers

Update controllers