Encryption! Now with commentary
Merge remote-tracking branch 'origin/master'