closes #1221
Merge pull request #1248 from diegosarmentero/issue1221

closes #1221