Fixing a bug.
Merge branch 'develop' into feature/Encryption