Merge pull request #197 from TheBlueMatt/master