Merge branch 'hoshsadiq-master'