Merge pull request #8 from TheBlueMatt/master