Add Encrypt Data option for non-primary users
Some minor fixes and code cleanup
Merge pull request #17 from alexnivan/mybranch

Add Encrypt Data option to non-primary users