Updated master with changes from solution