issue #1143 also removed some comments I left on a previous issue
Merge pull request #1179 from conejoninja/1143

issue #1143 also removed some comments I left on a previous issue