Arash branch

merge changes with master branch