Updating main with encryption fixes #27

Closed eHag-FRU closed 15 hours ago