Refactored policy
Merge pull request #3 from kborgmeyer/refactor-policy

Refactored policy