Merge pull request #51 from TheBlueMatt/master