Update personal fork with latest 0.3.4 master.