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

Backup master 18