Fixed Issue #1233
Merge pull request #1298 from diegosarmentero/master

Fixed Issue #1233