More typos fixed by nashamari
Merge branch 'nashamri-master'