Merge pull request #652 from TheBlueMatt/master