Merge pull request #497 from sylvaindeloux/master

Added serializer handlers