issue124
Merge branch 'issue124'
on abandonne #124