Secure storage support
Fixed typos
Merge branch 'develop'