Merges the decoder part of the SILK draft