Renaming of loaders and serializer (bugfix)
Merge remote-tracking branch 'refs/remotes/origin/master'