Merge pull request #650 from emmanuel-keller/1.6

Bug fix and enhancement