Update to 0.3.36