Added chapter 8 and extracted source