Fixed minor bugs
Merge branch 'master' of https://github.com/essamhassan/SWE-SERVICE2CODE