Merge pull request #1044 from TheBlueMatt/0.0.100