tested with aes-ctr in pycrypto
Merge remote-tracking branch 'origin/master'
fix some errors brought by merging