Merge pull request #404 from TheBlueMatt/newenc