Would you mind merging up your latest 0.0.6 changes?