Fixes #59
Fixes #60
Merge branch 'master' of github.com:rdkit/rdkit