Merge pull request #65 from TheBlueMatt/master