Merge pull request #200 from TheBlueMatt/2018-09-187-tweaks