T1 lotfy 1.10

@kalamoni  @abdelrahmansakr  @andrewkhouzam  please review and merge  #189