fix deriving
Merge pull request #77 from ocsigen/deriving

sync with deriving