0.0.6 master commit.