Merge pull request #5 from TheBlueMatt/master