Update to include changes needed to support entitlement
Merge pull request #19 from pulp/barnabycourt-entitlement

Update to include changes needed to support entitlement