Issue #167

@AminaZoheir review