Merge in @siffiejoe's Bitlib alternative branch