resolving latest 1.1
Merge pull request #144 from DevYah/T1_mlotfy_1.1

resolving latest 1.1
T2_halawa_2.4