Almost ready for 1.0.6