Merge pull request #232 from TheBlueMatt/master