Correctly handle 0x61 and 0x6C.

This "fixes" #11 for me but the code there seems to be too excessive and the fix does not want to be "correct". What is the purpose of the "convert to short apdus"  for example? I think it could be well written in a way simpler and shorter form.