Update to take recent events into account
Merge branch 'master' of git://github.com/Fodaro/just-encrypt
Bump copyright