Merge pull request #410 from TheBlueMatt/master