make python more general
Merging release into master.