Added --cipher-algo for symmetric encryption
Merge branch 'trunk'