Improve otp decoding

Should fix #14.