Changes made per Programming Assignment 2 - 2014-07-27