Greg James Merge pull request #2 from munsie/master