Merge pull request #26 from marwa-mimi/master

commit
commercant
Merge pull request #28 from marwa-mimi/master

commit
Merge pull request #29 from marwa-mimi/master

commit layout
commercant
commit layout