Update Changelog and version to 1.3.6