Merge pull request #3 from etenzor/master

Merge
encoder -> encoders
Merge pull request #5 from etenzor/john

John