seperated de/encoders from providers (fixes #21)
Merge branch 'dev'

* dev:
  seperated de/encoders from providers (fixes #21)