Merge pull request #409 from TheBlueMatt/master