Merge pull request #148 from eustas/master

Fixups in encoder and decoder.