issue #1224
Merge pull request #1228 from conejoninja/1224

issue #1224