Encoder switch/decoder decoupling
Merge branch 'master' of git@github.com:pichenettes/avril