Adjustment of setup.py to use setuptools entry_point to generate runnable script (was not generated from distutils)
Merge remote-tracking branch 'origin/master'