Encodings

I'm sending this again instead of #43 since Coveralls does not seem to like my master branch.