Merge pull request #33 from rmzamora/rz-patch-01

fix Ambiguous class resolution error
Merge remote-tracking branch 'sonata-project/master'