add storage function
Merge branch 'dev'
add new charactor and secret mode
Merge branch 'dev'
fixed conflict