merge

merge mola:master changes to ruhollah:master.