update to 0.3.6

Change-Id: Idd372df4276cb685185a72d5811dd65a50079a64