Merge pull request #1 from congma/master

Some Python-specific modifications