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