configurable charset
update docs
update docs
configurable charset
update docs
update docs
resolve conflicts
Merge pull request #65 from kevinludwig/master

make charset configurable