Merge pull request #393 from fcr/master

Bring python bindings up to date.