Update to latest API
Merge pull request #6 from zf-fr/update

Update to latest API