Merge pull request #74 from TheBlueMatt/2018-07-shutdown-event