update version to 3.9.7
removing a few unneeded code
Removing a patch
Merge pull request #136 from sdelements/unittest_import_rebase

Unittest import with line ending fix rebase
merging unittests
Fix merge conflicts