modify encrypt & add manager
Merge remote-tracking branch 'origin/master'