Adding context class
Merge branch 'master', remote-tracking branch 'mfaraji/master'
New Version of Policy Engine
Merge remote-tracking branch 'mfaraji/master'