Issue #18: Creation of Encryption Service
Merge origin/master