Bloep
Merge branch 'master' of github.com:ruurdadema/encoder