more minor changes
Merge remote branch 'remote/master'
More Integration. File Encryption