first commit in new shervin branch

Pull request from my personal branch to the master