Completed issues 4 and 6

~requested: 150