Andrew khouzam

Issue #12 
@sedramina @AmrEmara @samehmetias 
Please merge me!