simongog Merge pull request #414 from chrisbarber/master