20140918 - Added encryption mechanism