improved comments
Merge branch 'security'