Minor changes for sphinx
Merge from github
merged in changes from ver_6