Merge pull request #30 from chaturadilan/master

Functional fixes for Policies
fix for APPM-153,APPM-157,APPM-105
formatted
Merge branch 'upstream/master'