Merge pull request #14 from TheBlueMatt/2018-03-fuzz-fixes-1