Update Chapter-1 with latest changes from master branch.