merge docs from master
merge master, convert readme to rst