Commit 7f7a2fb48cec63c0459ec6b6e7260810bfb01819

eustas 2015-09-01T15:04:54

Merge pull request #148 from eustas/master Fixups in encoder and decoder.