closes #1207
Merge pull request #1249 from diegosarmentero/issue1207

closes #1207