fix doc for #29
update version
typo
update documentation
Merge remote-tracking branch 'upstream/master'