Improved module execution with python -m
Merge branch 'master' into windows