Some refactor and cleanup and added support for selecting encryption key size
Recompiled with support for selecting key size
Merge remote-tracking branch 'refs/remotes/Bucket/development'