rob-murray Merge pull request #3 from rob-murray/updates