updated for 0.10.x. preparing for the book publishing