Merge @saidalbahra master branch