Merge pull request #352 from TheBlueMatt/newenc