more encryption methods
close #41
merge master