fixing part 2
Merge branch 'python-master' of https://github.com/ArchieMonji/MergeToSurvive into python-master