Some changes for v0.3.4