Issue #112
Merge pull request #113 from elcodi/feature/encoders

Issue #112