Merge pull request #34 from TheBlueMatt/master