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
issue #1167
Merge pull request #1180 from conejoninja/1167

issue #1167
issue #1170
Merge pull request #1181 from conejoninja/1170

issue #1170