Merge pull request #49 into version 0.6.49