few security changes
mergeMerge branch 'master' of https://github.com/shivshankardayal/Kunjika