Upgraded Encryption Algorithm, Added Automated Tests