Merge pull request #38 from Drup/master

Fix entities in client code.