Added functionality from chapter 14

Signed-off-by: vidi28 <alex.vidrean@gmail.com>