resolved a security issue
improved security
Merge branch 'master' into public