encrypt can be called with or without a parameter
Merge branch 'master' into portable