* Merge branch master into issue_114
* Added .python-version to .gitignore file (pyversion config file)