Update to latest entity api module.
Merge pull request #21 from shushu/19

Update to latest entity api module.