Merge pull request #14 from bassamtiano/master

Merge pull request #12 from bassamtiano/backup-master-18
Merge pull request #15 from bassamtiano/backup-master-18

Merge pull request #14 from bassamtiano/master