stable version, preparing to move to python XY
Merge remote-tracking branch 'origin/master'