Update v2.1.8 [1640]

* fixed book updater
* improved code design