issue #1619
Merge pull request #1625 from conejoninja/1619

issue #1619
Merge pull request #1657 from osclass/dev34

Dev34