Controllers Modification
Merge branch 'master' of https://github.com/antoniosHafez/Nubia