Merge pull request #54 into version 0.6.54