Added secure and frame request options
Some changes to get it to work in our project
Merge branch 'secureparam'