merge 3.8.6
Merge pull request #41 from poumason/master

merge 3.8.6