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

Modified policy framework update