Merge pull request #1 from JohnLangford/master

Catch up