More work on Assignment 5
Merge remote-tracking branch 'origin'