Merge pull request #18 from TheBlueMatt/2018-04-fuzzing-expansion