Merge pull request #192 from python/develop

Merge develop into master
Merge branch 'master' into develop