make the decoder type a commandline option
Merging release into master.