Merge branch 'hamed'