Implements issue #561
Merge pull request #562 from emmanuel-keller/1.5

Implements issue #561