Merge pull request #50 from TheBlueMatt/master