17.8 Update Solution
Merge pull request #12 from cookieisaac/17.8Update

17.8 Update Solution