Charles 3.8.1
Merge pull request #1007 from leonardvandriel/master

Charles 3.8.1