Version 1.9.3.6 - latest additions