Merge pull request #704 from TheBlueMatt/master