Started adding encryption support, see #7