Merge pull request #436 from TheBlueMatt/master