Develop

Dear Sadegh, please kindly review these commits. tnx :)