Merge branch 'hamed' into brian