Merge pull request #51 into version 0.6.51