Ch 04

cc/ @fabioyamate @carlosgaldino.

Please review.