C3 nohahesham master conflicts

master conflicts fixed
@m0hamed 
[issue #204]
[issue #207]