Fixed Issue #1210
Merge pull request #1299 from diegosarmentero/master

 Fixed Issue #1210