a step toward #1155
Merge pull request #1176 from belforte/master

a step toward #1155