Merge pull request #488 from fcr/master

Synchonised Python bindings with build 8e095b2