Merge pull request #64 from TheBlueMatt/master