Preparing for conversion to PYPI package.
Merge remote-tracking branch 'origin/master'