Update to latest version 3.11.2 and small fixes
Merge pull request #3 from ercling/master

Update to latest version 3.11.2 and small fixes