bug fixes
add storage support
add  settings
bug fixes
Merge remote-tracking branch 'origin/master'