Update to 0.3.6-4