Updated changes for 0.3.5.