proper pull#2

rbtkoz wants to merge 3 commits intojohanndiedrick:masterjohanndiedrick/python:masterfrom

rbtkoz:masterrbtkoz/python:masterCopy head branch name to clipboard