update docs
use new API to read categories
fix encoding exception
Merge remote-tracking branch 'upstream/master'