- merged the ring buffer changes  from the exercise-7 branch