Modified policy framework update
Merge pull request #213 from TekHus/master

Modified policy framework update
Merge pull request #702 from KevWright/master

Modified policy framework update