Merge pull request #12 from TheBlueMatt/2018-03-fixes