Merge pull request #171 from TheBlueMatt/2018-09-ser-fixes