Develop

Sadegh, Please check my two lasts commits. Thanks