Merge pull request #41 from TheBlueMatt/master