issue #1222
Merge pull request #1245 from conejoninja/1222

issue #1222