Completed Issues 15, 16, 21 and Added Issues 20, 21

~requested: 675