Chapter 3

Merge Chapter3 changes to Master