Closed last pull request and submitted a more current one

Two commits were made.