Merge branch 'almossawi-master'