updated
added encryption
fixed line trimming