Merge pull request #525 from TheBlueMatt/master