Merge pull request #186 from TheBlueMatt/2018-09-ser-rework-2