Consolidation in policy and promises
Merge pull request #227 from TekHus/master

Consolidation in policy and promises