Implements #266
Remove debug info #266
Merge pull request #1220 from emmanuel-keller/1.5

Implements #266