Nothing needs to be merged. Refactored the TbSciFi Decoder. Please push any new changes into this branch.