Fixed to work again 3.1.x and earlier SDKs
Merge pull request #2 from FokkeZB/patch-1

Fixed to work again 3.1.x and earlier SDKs