Fixes #22

And a couple of related OData issues.