Merge pull request #16 from TheBlueMatt/2018-03-fixups