Merge pull request #320 from fcr/master

Synchronise python bindings to current build