Merging Reza with Master

Merging Reza with MasterMerging