added nullCipher
added key an IV instance variables
whoops
Merge remote-tracking branch 'origin/master' into Miranda