merge pull request #55 into version 0.6.55