some py stuff
Merging release into master.