Added better serializer support
Merge branch 'master' of github.com:bzwheeler/chi