Merge pull request #96 from ppetit/policies

Policies